Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:40:45 +0000 (23:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:40:45 +0000 (23:40 -0700)
commitf164f47a153d9ee32530f7ef80551d1e316fc0e7
treeb4a743106b69292b139f2e34b1f5749bf83ef0eb
parent360606e37ca87b54d7ee11cbd10efb102e689156
parente54984f1b906e93887eefd1fc3cdab52bd3b9520
Merge from trunk.
src/ChangeLog
src/bidi.c
src/composite.c
src/dispextern.h
src/editfns.c
src/ftfont.c
src/process.c
src/xdisp.c
src/xfaces.c